From fca143edd9caa301f88680e56377d22cc3d58e42 Mon Sep 17 00:00:00 2001
From: Rotem Liss <rotem@users.mediawiki.org>
Date: Sun, 29 Jul 2007 02:18:16 +0000
Subject: [PATCH] A message (fileexists) with the same name of another one was
 introduced in r24313; renaming it to fileexistserror. Other messages files
 that updated since this revision may also have to rename the message.

---
 includes/filerepo/FSRepo.php      | 4 ++--
 languages/messages/MessagesEn.php | 2 +-
 languages/messages/MessagesHe.php | 2 +-
 maintenance/language/messages.inc | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php
index d3d1b70c92..84ec9a2709 100644
--- a/includes/filerepo/FSRepo.php
+++ b/includes/filerepo/FSRepo.php
@@ -166,10 +166,10 @@ class FSRepo extends FileRepo {
 					$hashSource = sha1_file( $srcPath );
 					$hashDest = sha1_file( $dstPath );
 					if ( $hashSource != $hashDest ) {
-						$status->fatal( 'fileexists', $dstPath );
+						$status->fatal( 'fileexistserror', $dstPath );
 					}
 				} else {
-					$status->fatal( 'fileexists', $dstPath );
+					$status->fatal( 'fileexistserror', $dstPath );
 				}
 			}
 		}
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 4383bb1181..139b3e4e9a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -767,7 +767,7 @@ Please report this to an administrator, making note of the URL.',
 'filedeleteerror'      => 'Could not delete file "$1".',
 'directorycreateerror' => 'Could not create directory "$1".',
 'filenotfound'         => 'Could not find file "$1".',
-'fileexists'           => 'Unable to write to file "$1": file exists',
+'fileexistserror'      => 'Unable to write to file "$1": file exists',
 'unexpected'           => 'Unexpected value: "$1"="$2".',
 'formerror'            => 'Error: could not submit form',
 'badarticleerror'      => 'This action cannot be performed on this page.',
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index 6ac53d542e..98b5ed1621 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -505,7 +505,7 @@ $messages = array(
 'filedeleteerror'      => 'מחיקת "$1" נכשלה.',
 'directorycreateerror' => 'יצירת התיקייה "$1" נכשלה.',
 'filenotfound'         => 'הקובץ "$1" לא נמצא.',
-'fileexists'           => 'הכתיבה לקובץ "$1" נכשלה: הקובץ קיים',
+'fileexistserror'      => 'הכתיבה לקובץ "$1" נכשלה: הקובץ קיים',
 'unexpected'           => 'ערך לא צפוי: "$1"="$2"',
 'formerror'            => 'שגיאה: לא יכול לשלוח טופס.',
 'badarticleerror'      => 'לא ניתן לבצע פעולה זו בדף זה.',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index bcbdb4cddf..78644cea3e 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -304,7 +304,7 @@ $wgMessageStructure = array(
 		'filedeleteerror',
 		'directorycreateerror',
 		'filenotfound',
-		'fileexists',
+		'fileexistserror',
 		'unexpected',
 		'formerror',
 		'badarticleerror',
-- 
2.20.1